Skip to content

Conversation

@protegh
Copy link

@protegh protegh commented May 8, 2023

No description provided.

Overv and others added 30 commits April 26, 2020 19:00
This commit fixes issue #133.
small improvement of build time and image size
Fix Osmosis configuration change
Update PostGIS, OpenStreetMap Carto stylesheet and trim_osc.py helper
* fix naciscdn.org

* fix

Co-authored-by: prih <[email protected]>
* Update Dockerfile

* Add comment

* rm debs after install

* Get ready for buildkit

* Update Dockerfile

* Cleanup indenting

* Update Dockerfile

* Update Dockerfile

* Install certificates required for downloads

Co-authored-by: Alexander Overvoorde <[email protected]>
schteph and others added 26 commits October 11, 2021 22:22
Added -E flag to use the set up environment.
* workflow: build and test pushes and pull_requests to master ; deploy image to GHCR

* improved tiles verification (*)

- Export the tiles as an artifact before verifying.
- Only empty.png is verified via checksum.
- Verify that all tiles are image/png files.
- Verify that all tiles are different from another.

* import and start the test server with automatic updates

* DockerHub deployment (*)

if secrets.DOCKERHUB_USERNAME and secrets.DOCKERHUB_PASSWORD are non-empty
Changes:
- /var/lib/postgresql/14/main/            => /data/database/
- /var/lib/mod_tile/                      => /data/tiles/
- /home/renderer/src/openstreetmap-carto/ => /data/style/
- /data.osm.pbf                           => /data/region.osm.pbf
- /data.poly                              => /data/region.poly
- /nodes/flat_nodes.bin                   => deprecated (use FLAT_NODES=enabled instead)

Because some files are needed later and should never be separated from the database, the import does save those files now into /data/databases/:
- /data/database/region.poly
- /data/database/flat_nodes.bin
- /data/database/planet-import-complete
- and automatic update artifacts
* multiarch build for additional linux/arm64/v8 and linux/arm/v7 support

This commit fixes issue #291

* print logs of run command

* drop arm/v7 for now (untested)

* build arm64/v8 parallel during the build stage (without testing the image)
#296)

* Use tile expiration settings from env if set, or default values as before.

* Update openstreetmap-tiles-update-expire.sh

Co-authored-by: galewis2 <[email protected]>
Leaflet 1.8.0	Stable version, released on April 18, 2022.
Leaflet 1.7.1	Previous stable version, released on September 3, 2020.

install leaflet localy so server works offline

Co-authored-by: galewis2 <[email protected]>
so non-semver tags don't trigger a deployment that will fail.

It's not a normal regexp syntax. Dots `.` will only match dots and not any characters.
* Update Dockerfile

add support to PostgreSQL 15 and alter encryption method to scram-sha-256 instead of md5

* Update run.sh

add support to PostgreSQL 15
@dbahrdt dbahrdt self-requested a review May 8, 2023 16:05
README.md Outdated
import
```

>Note that if you use a folder other than `/nodes` then you must make sure that you manually set the owner to `renderer`!
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ist dieser Hinweis noch nötig? Wird jetzt automatisch der owner gesetztz?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstream hat im run.sh alles für Flat nodes vorbereitet, wobei der Ordner jetzt nach /data/database/ verschoben wird und dabei den Owner renderer bekommt. Will man Flat nodes verwenden, so muss man die ENV-Variable FLAT_NODES setzen.

@dbahrdt
Copy link
Member

dbahrdt commented May 8, 2023

Es gibt hier aber einige Konflikte, die Du lösen musst. Das vorgehen ist wie folgt:

  1. Diese Repo clonen
  2. Upstream als weiteren remote hinzufügen
  3. Branch aufmachen feature/merge-upstream, welcher von fmi-alg:master weg geht
  4. upstream::master in feature/merge-upstream mergen
  5. Konflikte lösen
  6. Neuen PR stellen

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.